From: Antonio Niño Díaz <antonio.ninodiaz@arm.com>
Date: Wed, 16 Jan 2019 10:45:41 +0000 (+0000)
Subject: Merge pull request #1757 from antonio-nino-diaz-arm/an/includes
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=edcb50abe7b4a4e168a36e12168bf5e7a8b28700;p=project%2Fbcm63xx%2Fatf.git

Merge pull request #1757 from antonio-nino-diaz-arm/an/includes

Move BL1 and BL2 private defines to bl_common.h
---

edcb50abe7b4a4e168a36e12168bf5e7a8b28700
diff --cc plat/arm/common/arm_bl1_setup.c
index 73fee607,1a0385a7..3a8b5c27
--- a/plat/arm/common/arm_bl1_setup.c
+++ b/plat/arm/common/arm_bl1_setup.c
@@@ -16,10 -16,9 +16,8 @@@
  #include <lib/xlat_tables/xlat_tables_compat.h>
  #include <plat/common/platform.h>
  
 -#include <arm_def.h>
  #include <plat_arm.h>
  
- #include "../../../bl1/bl1_private.h"
- 
  /* Weak definitions may be overridden in specific ARM standard platform */
  #pragma weak bl1_early_platform_setup
  #pragma weak bl1_plat_arch_setup
diff --cc plat/arm/css/sgi/sgi_plat.c
index 387be36b,2515e3b1..ca90aada
--- a/plat/arm/css/sgi/sgi_plat.c
+++ b/plat/arm/css/sgi/sgi_plat.c
@@@ -14,8 -14,9 +14,7 @@@
  #include <plat/common/platform.h>
  #include <services/secure_partition.h>
  
 -#include <arm_def.h>
 -#include <arm_spm_def.h>
  #include <plat_arm.h>
- #include "../../../../bl1/bl1_private.h"
  
  #if USE_COHERENT_MEM
  /*